Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 25 Feb 2010 16:08:53 +0000 (17:08 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 25 Feb 2010 16:08:53 +0000 (17:08 +0100)
commitd27b189182eb87a023928a90695c375662a30a2a
treedc6d92a02e38bdce2db15042e4195302bd4468d4
parent6ac44bb3561c4fae747aca12e6723453966403ed
parente9c79fd3afb2c28845ecd004d3efdaa7a89b70dd
Merge from trunk